add new modification MoveVoltageLevelFeederBays #87

EtienneLt · 2025-08-25T12:20:41Z

No description provided.

Signed-off-by: Etienne LESOT <[email protected]>

ipirog · 2025-09-10T09:07:46Z

src/main/java/org/gridsuite/modification/utils/ModificationUtils.java

    }

-    private void processConnectivityPosition(ConnectablePosition<?> connectablePosition,
+    public void processConnectivityPosition(ConnectablePosition<?> connectablePosition,


You can keep private here :/

sonarqubecloud · 2025-09-16T08:58:59Z

Quality Gate passed

Issues
5 New issues
0 Accepted issues

Measures
0 Security Hotspots
82.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

etiennehomer · 2025-09-18T09:00:37Z

src/main/java/org/gridsuite/modification/dto/MoveVoltageLevelFeederBaysInfos.java

+    private String voltageLevelId;
+
+    @Schema(description = "Feeder bays list")
+    private List<ConnectablePositionModificationInfos> feederBaysAttributeList;


Suggested change

private List<ConnectablePositionModificationInfos> feederBaysAttributeList;

private List<ConnectablePositionModificationInfos> feederBays;

etiennehomer · 2025-09-18T09:04:54Z

src/main/java/org/gridsuite/modification/modifications/BusbarSectionFinderTraverser.java

 * @author Slimane Amar <slimane.amar at rte-france.com>
 */
 // FIXME : to remove when this class is available in network-store
 public class BusbarSectionFinderTraverser implements Terminal.TopologyTraverser {


Move those changes in another PR. So the review can be done with gridsuite/network-map-server#288. And the changes in the tests will be reviewed with it

etiennehomer · 2025-09-18T09:11:19Z

src/main/java/org/gridsuite/modification/utils/ModificationUtils.java

-        BusbarSectionFinderTraverser connectedBusbarSectionFinder = new BusbarSectionFinderTraverser(terminal.isConnected());
-        terminal.traverse(connectedBusbarSectionFinder, TraversalType.BREADTH_FIRST);
-        return connectedBusbarSectionFinder.getFirstTraversedBbsId();
+        BusbarSectionFinderTraverser finder = new BusbarSectionFinderTraverser();


Move those changes in another PR. So the review can be done with gridsuite/network-map-server#288. And the changes in the tests will be reviewed with it

etiennehomer · 2025-09-18T09:12:39Z

src/main/resources/org/gridsuite/modification/reports.properties

 network.modification.TotalOutwardHvdcFlow = The HVDC balance is : ${hvdcBalance} MW
 network.modification.TwoWindingsTransformerProperties = Properties
 network.modification.VOLTAGE_LEVEL_TOPOLOGY_MODIFICATION = Voltage Level topology modification ${voltageLevelId}
+network.modification.MOVE_VOLTAGE_LEVEL_FEEDER_BAYS = Move voltage level feeder bays modification ${voltageLevelId}


Check US specification for logs. That's not what is asked

etiennehomer · 2025-09-18T09:12:55Z

src/test/java/org/gridsuite/modification/modifications/GeneratorModificationTest.java

        Generator generator = getNetwork().getGenerator("idGenerator");
        Terminal terminal = generator.getTerminal();
        assertEquals("v2", terminal.getVoltageLevel().getId());
-        BusbarSectionFinderTraverser connectedBusbarSectionFinder = new BusbarSectionFinderTraverser(terminal.isConnected());


Move those changes in another PR. So the review can be done with gridsuite/network-map-server#288

etiennehomer · 2025-09-18T09:23:03Z

src/main/java/org/gridsuite/modification/modifications/MoveVoltageLevelFeederBays.java

+        if (connectable == null) {
+            throw new NetworkModificationException(MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR, String.format(CONNECTABLE_NOT_FOUND, info.getEquipmentId()));
+        }
+        if (!(connectable instanceof Injection<?>) && !(connectable instanceof Branch<?>)) {


Do we need this ?

And it excudes 3WT

We should rather exclude busbarSection as it is done in MoveFeederBay. Something like :
(connectable instanceof BusbarSection) throw ...

etiennehomer · 2025-09-18T09:42:54Z

src/main/java/org/gridsuite/modification/modifications/MoveVoltageLevelFeederBays.java

+        return ModificationType.MOVE_VOLTAGE_LEVEL_FEEDER_BAYS.name();
+    }
+
+    private void modifyInjectionConnectablePosition(Network network, Injection<?> injection, ConnectablePositionModificationInfos info, ReportNode subReportNode) {


modifyInjectionConnectablePosition and modifyBranchConnectablePosition should be one method modifyConnectablePosition().
With a if else for modifyInjectionConnectivityAttributes() and modifyBranchConnectivityAttributes()

etiennehomer · 2025-09-18T10:59:09Z

src/main/java/org/gridsuite/modification/modifications/MoveVoltageLevelFeederBays.java

+    private InjectionModificationInfos buildInjectionModificationInfos(ConnectablePositionModificationInfos info) {
+        InjectionModificationInfos injectionInfos = new InjectionModificationInfos();
+        injectionInfos.setEquipmentId(info.getEquipmentId());
+        injectionInfos.setConnectionPosition(new AttributeModification<>(info.getConnectionPosition(), OperationType.SET));


Those 3 rows can be a method. And the method used here and in buildBranchModificationInfos()

etiennehomer · 2025-09-18T11:04:16Z

src/main/java/org/gridsuite/modification/modifications/MoveVoltageLevelFeederBays.java

+        Connectable<?> connectable = network.getConnectable(info.getEquipmentId());
+        return switch (connectable) {
+            case Injection<?> injection -> injection.getTerminal();
+            case Branch<?> branch -> getTerminalFromBranch(branch, info);


Suggested change

case Branch<?> branch -> getTerminalFromBranch(branch, info);

case Branch<?> branch -> branch.getTerminal(info.getConnectionSide());

etiennehomer · 2025-09-18T11:05:01Z

src/main/java/org/gridsuite/modification/modifications/MoveVoltageLevelFeederBays.java

+        };
+    }
+
+    private Terminal getTerminalFromBranch(Branch<?> branch, ConnectablePositionModificationInfos info) {


remove method

etiennehomer · 2025-09-18T12:04:58Z

src/main/java/org/gridsuite/modification/dto/ConnectablePositionModificationInfos.java

+@Setter
+@ToString(callSuper = true)
+@Schema(description = "Connectable position modification")
+public class ConnectablePositionModificationInfos {


Suggested change

public class ConnectablePositionModificationInfos {

public class MoveFeederBayInfos {

etiennehomer · 2025-09-18T12:11:37Z

src/main/java/org/gridsuite/modification/modifications/MoveVoltageLevelFeederBays.java

+    }
+
+    private void modifyInjectionConnectablePosition(Network network, Injection<?> injection, ConnectablePositionModificationInfos info, ReportNode subReportNode) {
+        ConnectablePosition connectablePosition = injection.getExtension(ConnectablePosition.class);


Suggested change

ConnectablePosition connectablePosition = injection.getExtension(ConnectablePosition.class);

ConnectablePosition oldConnectablePosition = injection.getExtension(ConnectablePosition.class);

etiennehomer · 2025-09-18T12:14:11Z

src/main/java/org/gridsuite/modification/modifications/MoveVoltageLevelFeederBays.java

+        return ModificationType.MOVE_VOLTAGE_LEVEL_FEEDER_BAYS.name();
+    }
+
+    private void modifyInjectionConnectablePosition(Network network, Injection<?> injection, ConnectablePositionModificationInfos info, ReportNode subReportNode) {


Suggested change

private void modifyInjectionConnectablePosition(Network network, Injection<?> injection, ConnectablePositionModificationInfos info, ReportNode subReportNode) {

private void modifyInjectionConnectablePosition(Network network, Injection<?> injection, ConnectablePositionModificationInfos newConnectablePositionInfos, ReportNode subReportNode) {

etiennehomer · 2025-09-19T08:42:26Z

src/main/java/org/gridsuite/modification/modifications/MoveVoltageLevelFeederBays.java

+        return branchInfos;
+    }
+
+    private void moveVoltageLevelBusOrBusbarSection(Network network, Connectable<?> connectable, ConnectablePositionModificationInfos info, ReportNode subReportNode) {


This method should be named moveFeederBay(). And also modifyVoltageLevelBusOrBusBarSectionAttributes() should be named moveFeederBay(). As the only thing they do is apply moveFeederBay() modfication from powsybl-core.

add new modification MoveVoltageLevelFeederBays

f411ee4

Signed-off-by: Etienne LESOT <[email protected]>

EtienneLt self-assigned this Aug 25, 2025

EtienneLt and others added 13 commits August 25, 2025 14:22

Merge branch 'main' into add-new-modification-MoveVoltageLevelFeederBays

a2b69bf

add tests

7b3c860

Signed-off-by: Etienne LESOT <[email protected]>

fix checkstyle

d70059e

Signed-off-by: Etienne LESOT <[email protected]>

more test

1e86744

Signed-off-by: Etienne LESOT <[email protected]>

fix

bb52932

Signed-off-by: Etienne LESOT <[email protected]>

fix

3a12caa

Signed-off-by: Etienne LESOT <[email protected]>

fix checkstyle

4645f9e

Signed-off-by: Etienne LESOT <[email protected]>

Merge branch 'main' into add-new-modification-MoveVoltageLevelFeederBays

d19a435

Merge branch 'main' into add-new-modification-MoveVoltageLevelFeederBays

f9cef7d

fix

f557713

Signed-off-by: Etienne LESOT <[email protected]>

fix and add coverage

1481bc0

Signed-off-by: Etienne LESOT <[email protected]>

add test

7645010

Signed-off-by: Etienne LESOT <[email protected]>

code review remarks

2a3e8c7

ipirog reviewed Sep 10, 2025

View reviewed changes

ipirog and others added 4 commits September 10, 2025 15:39

Merge branch 'main' into add-new-modification-MoveVoltageLevelFeederBays

d01731e

Merge branch 'main' into add-new-modification-MoveVoltageLevelFeederBays

c92216f

fix BusbarSectionFinderTraverser

3cb7471

Merge branch 'main' into add-new-modification-MoveVoltageLevelFeederBays

ef32d7b

etiennehomer requested changes Sep 18, 2025

View reviewed changes

etiennehomer requested changes Sep 19, 2025

View reviewed changes

	private List<ConnectablePositionModificationInfos> feederBaysAttributeList;
	private List<ConnectablePositionModificationInfos> feederBays;

	case Branch<?> branch -> getTerminalFromBranch(branch, info);
	case Branch<?> branch -> branch.getTerminal(info.getConnectionSide());

	public class ConnectablePositionModificationInfos {
	public class MoveFeederBayInfos {

	ConnectablePosition connectablePosition = injection.getExtension(ConnectablePosition.class);
	ConnectablePosition oldConnectablePosition = injection.getExtension(ConnectablePosition.class);

	private void modifyInjectionConnectablePosition(Network network, Injection<?> injection, ConnectablePositionModificationInfos info, ReportNode subReportNode) {
	private void modifyInjectionConnectablePosition(Network network, Injection<?> injection, ConnectablePositionModificationInfos newConnectablePositionInfos, ReportNode subReportNode) {

add new modification MoveVoltageLevelFeederBays #87

Are you sure you want to change the base?

add new modification MoveVoltageLevelFeederBays #87

Uh oh!

Conversation

EtienneLt commented Aug 25, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Sep 16, 2025

Quality Gate passed

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!